Auto merge of #1867 - alex:patch-1, r=alexcrichton
authorbors <bors@rust-lang.org>
Mon, 3 Aug 2015 01:22:36 +0000 (01:22 +0000)
committerbors <bors@rust-lang.org>
Mon, 3 Aug 2015 01:22:36 +0000 (01:22 +0000)

Trivial merge